blktap2: Remove gnu89-inline option from CFLAGS

Not supported by older versions of gcc.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile
index 61b0153b5e5f234a0e7a9c02eb03f16df61f680c..cd3336ad3c09e9603ea4e9b1ae704f7b1bf6a4b7 100644 (file)
--- a/tools/blktap2/drivers/Makefile
+++ b/tools/blktap2/drivers/Makefile
@@ -49,8 +49,7 @@ REMUS-OBJS  += hashtable.o
 REMUS-OBJS  += hashtable_itr.o
 REMUS-OBJS  += hashtable_utility.o
 
-$(REMUS-OBJS): CFLAGS += -fgnu89-inline -I$(XEN_XENSTORE)
-
+$(REMUS-OBJS): CFLAGS += -I$(XEN_XENSTORE)
 
 LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src
 tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := $(LIBAIO_DIR)/libaio.a

diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c
index b3613861043b675a22567416770a0532a16d02bc..731917ccf16576905230c03f85eaf3e674a76094 100644 (file)
--- a/tools/blktap2/drivers/hashtable_itr.c
+++ b/tools/blktap2/drivers/hashtable_itr.c
@@ -5,6 +5,13 @@
 #include "hashtable_itr.h"
 #include <stdlib.h> /* defines NULL */
 
+struct hashtable_itr {
+       struct hashtable *h;
+       struct entry *e;
+       struct entry *parent;
+       unsigned int index;
+};
+
 /*****************************************************************************/
 /* hashtable_iterator    - iterator constructor */
 

diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h
index a67e7de504f1f6e0a4d4195e03cc0978070b8cfb..81da83855dc00535acfa55ff96af9a1681b0e56c 100644 (file)
--- a/tools/blktap2/drivers/hashtable_itr.h
+++ b/tools/blktap2/drivers/hashtable_itr.h
@@ -5,17 +5,7 @@
 #include "hashtable.h"
 #include "hashtable_private.h" /* needed to enable inlining */
 
-/*****************************************************************************/
-/* This struct is only concrete here to allow the inlining of two of the
- * accessor functions. */
-struct hashtable_itr
-{
-       struct hashtable *h;
-       struct entry *e;
-       struct entry *parent;
-       unsigned int index;
-};
-
+struct hashtable_itr;
 
 /*****************************************************************************/
 /* hashtable_iterator
@@ -28,20 +18,14 @@ hashtable_iterator(struct hashtable *h);
 /* hashtable_iterator_key
  * - return the value of the (key,value) pair at the current position */
 
-extern inline void *
-hashtable_iterator_key(struct hashtable_itr *i)
-{
-       return i->e->k;
-}
+void *
+hashtable_iterator_key(struct hashtable_itr *i);
 
 /*****************************************************************************/
 /* value - return the value of the (key,value) pair at the current position */
 
-extern inline void *
-hashtable_iterator_value(struct hashtable_itr *i)
-{
-       return i->e->v;
-}
+void *
+hashtable_iterator_value(struct hashtable_itr *i);
 
 /*****************************************************************************/
 /* advance - advance the iterator to the next element